From 5c0fa16fb6d9e8683b0ee1fbf3404fa0f2287c10 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 6 Feb 2006 14:52:45 +0100 Subject: [PATCH] Temporary fix to include PTY support in domU builds. Signed-off-by: Keir Fraser --- buildconfigs/linux-defconfig_xenU_x86_32 | 5 ++++- buildconfigs/linux-defconfig_xenU_x86_64 | 3 +++ linux-2.6-xen-sparse/drivers/Kconfig | 14 ++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/buildconfigs/linux-defconfig_xenU_x86_32 b/buildconfigs/linux-defconfig_xenU_x86_32 index 66e2291c72..39c9ee9363 100644 --- a/buildconfigs/linux-defconfig_xenU_x86_32 +++ b/buildconfigs/linux-defconfig_xenU_x86_32 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.16-rc2-xenU -# Fri Feb 3 16:57:27 2006 +# Mon Feb 6 13:25:40 2006 # CONFIG_X86_32=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -381,6 +381,9 @@ CONFIG_NETDEVICES=y # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set # CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 # # SN Devices diff --git a/buildconfigs/linux-defconfig_xenU_x86_64 b/buildconfigs/linux-defconfig_xenU_x86_64 index 3b1e706cc5..8c19d6ef8a 100644 --- a/buildconfigs/linux-defconfig_xenU_x86_64 +++ b/buildconfigs/linux-defconfig_xenU_x86_64 @@ -600,6 +600,9 @@ CONFIG_ATMEL=m # Wan interfaces # # CONFIG_WAN is not set +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 # # ATM drivers diff --git a/linux-2.6-xen-sparse/drivers/Kconfig b/linux-2.6-xen-sparse/drivers/Kconfig index 6a9851b899..ebb5c076af 100644 --- a/linux-2.6-xen-sparse/drivers/Kconfig +++ b/linux-2.6-xen-sparse/drivers/Kconfig @@ -77,6 +77,20 @@ source "drivers/mmc/Kconfig" source "drivers/infiniband/Kconfig" endif +if XEN && !XEN_PHYSDEV_ACCESS +# Gross hack. Fix later by allowing unprivileged guest to include +# char/Kconfig without breaking the build. +config UNIX98_PTYS + bool + default y +config LEGACY_PTYS + bool + default y +config LEGACY_PTY_COUNT + int + default "256" +endif + source "drivers/sn/Kconfig" source "drivers/edac/Kconfig" -- 2.30.2